Skip to content

[8.x](backport #42886) [feat][fbreceiver] - enable http internal monitoring#43229

Merged
VihasMakwana merged 5 commits into8.xfrom
mergify/bp/8.x/pr-42886
Mar 17, 2025
Merged

[8.x](backport #42886) [feat][fbreceiver] - enable http internal monitoring#43229
VihasMakwana merged 5 commits into8.xfrom
mergify/bp/8.x/pr-42886

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 12, 2025

Proposed commit message

This PR enables internal monitoring for filebeat-receiver. This is needed to expose following details:

  • build information, commit id, version etc.
  • information about file's being harvested, processors etc.
  • runtime information such cpu, memory, gc etc

Screenshots

Screenshots before the changes for filebeat normal mode:

Screenshot 2025-03-07 at 4 28 11 PM Screenshot 2025-03-07 at 4 28 34 PM Screenshot 2025-03-07 at 4 28 23 PM Screenshot 2025-03-07 at 4 28 29 PM

Screenshots after the changes for filebeat normal mode:

Screenshot 2025-03-07 at 4 25 57 PM Screenshot 2025-03-07 at 4 25 49 PM Screenshot 2025-03-07 at 4 25 32 PM Screenshot 2025-03-07 at 4 25 24 PM

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Closes https://github.com/elastic/ingest-dev/issues/5136

This is an automatic backport of pull request #42886 done by Mergify.

@VihasMakwana @mergify
[feat][fbreceiver] - enable http internal monitoring (#42886)
c7fcca5 
* feat: enable http intenral monitoring

* enable metricreport

* review comments

* chore: review comments, final per namespace registry

* restore log

* notice

* add test cases

* public the lookup func

(cherry picked from commit da4c930)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner March 12, 2025 09:24
@mergify mergify bot added the backport label Mar 12, 2025
@mergify mergify bot requested a review from a team as a code owner March 12, 2025 09:24
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Mar 12, 2025
@mergify mergify bot requested review from belimawr and mauri870 and removed request for a team March 12, 2025 09:24
@mergify
Copy link
Contributor Author

mergify bot commented Mar 12, 2025

Cherry-pick of da4c930 has failed:

On branch mergify/bp/8.x/pr-42886
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit da4c93034.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   NOTICE.txt
	modified:   libbeat/api/routes.go
	modified:   libbeat/beat/info.go
	modified:   libbeat/cmd/instance/beat.go
	modified:   x-pack/filebeat/fbreceiver/factory.go
	modified:   x-pack/filebeat/fbreceiver/receiver.go
	modified:   x-pack/filebeat/tests/integration/otel_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 12, 2025
@github-actions github-actions bot added enhancement Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team labels Mar 12, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Mar 12, 2025
@elasticmachine
Copy link
Contributor

elasticmachine commented Mar 12, 2025

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@mergify
Copy link
Contributor Author

mergify bot commented Mar 17, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.x/pr-42886 upstream/mergify/bp/8.x/pr-42886
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-42886

@mergify
Copy link
Contributor Author

mergify bot commented Mar 17, 2025

This pull request has not been merged yet. Could you please review and merge it @VihasMakwana? 🙏

@VihasMakwana VihasMakwana merged commit d1b296c into 8.x Mar 17, 2025
144 checks passed
@VihasMakwana VihasMakwana deleted the mergify/bp/8.x/pr-42886 branch March 17, 2025 10:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@VihasMakwana VihasMakwana VihasMakwana approved these changes

@belimawr belimawr Awaiting requested review from belimawr belimawr was automatically assigned from elastic/elastic-agent-data-plane

@mauri870 mauri870 Awaiting requested review from mauri870 mauri870 was automatically assigned from elastic/elastic-agent-data-plane

Assignees

@VihasMakwana VihasMakwana

Labels

backport conflicts There is a conflict in the backported pull request enhancement Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @VihasMakwana